bitkeeper revision 1.1734 (42ba83ba7bRweVDldhJ4nYZQomQ8Lg)

Fix the x86/64 build. My change to make PAGE_SIZE a signed quantity
also made it int rather than long, which turns out to break stuff.
Debugged by Xin Li at Intel.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h
index 29b9f518a87ae2e13b8e24d14491003d41a8f6af..7732648f371c189f39be21367461c688dc543c27 100644 (file)
--- a/xen/include/asm-x86/page.h
+++ b/xen/include/asm-x86/page.h
@@ -6,7 +6,11 @@
  * It is important that the masks are signed quantities. This ensures that
  * the compiler sign-extends a 32-bit mask to 64 bits if that is required.
  */
+#ifndef __ASSEMBLY__
+#define PAGE_SIZE           (1L << PAGE_SHIFT)
+#else
 #define PAGE_SIZE           (1 << PAGE_SHIFT)
+#endif
 #define PAGE_MASK           (~(PAGE_SIZE-1))
 #define PAGE_FLAG_MASK      (~0)